Applied patches to new WMF 1.20wmf2 branch

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index d3c24ca..9801e04 100644 (file)
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -33,7 +33,7 @@ $wgConf = new SiteConfiguration;
 /** @endcond */
 
 /** MediaWiki version number */
-$wgVersion = '1.20alpha';
+$wgVersion = '1.20wmf2';
 
 /** Name of the site. It must be changed in LocalSettings.php */
 $wgSitename = 'MediaWiki';